Improve automated support for local webhooks #643
Conversation
| oc get -n openstack-operators "${CSV_NAME}" -o json | \ | ||
| jq -r 'del(.metadata.generation, .metadata.resourceVersion, .metadata.uid)' > "${CSV_FILE}" | ||
|
|
||
| printf \ |
There was a problem hiding this comment.
+1 thank you, this printf is very useful in case you want to rollback and re-apply the previous CSV.
| CUR_WEBHOOK_DEFS=$(oc get -n openstack-operators "${CSV_NAME}" -o=jsonpath='{.spec.webhookdefinitions}') | ||
|
|
||
| # Back-up CSV if it currently uses OLM defaults for deployment replicas or webhook definitions | ||
| if [[ "${CUR_REPLICAS}" -gt 0 || ( -n "${CUR_WEBHOOK_DEFS}" && "${CUR_WEBHOOK_DEFS}" != "[]" ) ]]; then |
There was a problem hiding this comment.
if .spec.webhookdefinitions (the key) is not there, you get an empty string, which justifies having a -n, but at the same time we need to make sure it's not an empty array [] because we might have deleted it already in previous runs.
+1 on this.
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: abays, fmount The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
openshift-merge-bot
bot
merged commit 3b151e5
into
openstack-k8s-operators:main
Reworks
make run-with-webhooktarget to trapSIGINTandSIGTERMso as to callclean_local_webhook.shin such a scenario. This way, a user can run the operator locally and automatically have the local webhooks removed when they finish running the operator viactrl+c.Also creates a backup of any existing OLM CSV for the operator while preparing to run the operator locally with webhooks, if the current CSV has a deployment
replicascount greater than zero and/or there arewebhookdefinitionspresent. That backup can then be easily re-applied to restore OLM CSV defaults viaoc patchby the user at their convenience.